Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(meta): do not store upstream actors in merge node #20222

Merged
merged 3 commits into from
Feb 5, 2025

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented Jan 20, 2025

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Previously we store the upstream actors information of each actor in the upstream_actor_id of NodeBody::Merge of StreamNode of each StreamActor. This is the only difference of StreamNode for each actor in a same fragment. In this PR, we will change to store the upstream actor information in a separate field besides StreamActor.

We define type alias

pub type ActorUpstreams = BTreeMap<FragmentId, HashSet<ActorId>>;
pub type StreamActorWithUpstreams = (StreamActor, ActorUpstreams);

In code of meta node, most appearance of StreamActor will be replaced with StreamActorWithUpstreams, so that the upstreams information can be carried together with usage to original StreamActor. The field upstream_actor_id of MergeNode and StreamActor is marked deprecated in the proto definition, so that we can review all the original on the fields, to ensure the refactor logic is correct.

Checklist

  • I have written necessary rustdoc comments.
  • I have added necessary unit tests and integration tests.
  • I have added test labels as necessary.
  • I have added fuzzing tests or opened an issue to track them.
  • My PR contains breaking changes.
  • My PR changes performance-critical code, so I will run (micro) benchmarks and present the results.
  • My PR contains critical fixes that are necessary to be merged into the latest release.

Documentation

  • My PR needs documentation updates.
Release note

Copy link

gru-agent bot commented Jan 21, 2025

This pull request has been modified. If you want me to regenerate unit test for any of the files related, please find the file in "Files Changed" tab and add a comment @gru-agent. (The github "Comment on this file" feature is in the upper right corner of each file in "Files Changed" tab.)

@wenym1 wenym1 force-pushed the yiming/merge-node-no-upstream-actors branch from 58bcf47 to 0e9e387 Compare January 21, 2025 07:13
@wenym1 wenym1 changed the title refactor(meta): (wip) do not store upstream actors in merge node refactor(meta): do not store upstream actors in merge node Jan 22, 2025
@wenym1 wenym1 force-pushed the yiming/merge-node-no-upstream-actors branch from 0e9e387 to 53af608 Compare January 22, 2025 11:31
Copy link
Member

@BugenZhao BugenZhao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

proto/stream_service.proto Outdated Show resolved Hide resolved
upstream_dispatcher_type: DispatcherType::Hash as _,
fields: sink_fields.to_vec(),
**merge_node = {
#[expect(deprecated)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to move the attributes onto the field?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just had a try, but the attribute doesn't work.

src/meta/src/stream/stream_graph/actor.rs Outdated Show resolved Hide resolved
proto/stream_plan.proto Show resolved Hide resolved
Copy link
Member

@yezizp2012 yezizp2012 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@shanicky shanicky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 5, 2025
@wenym1 wenym1 force-pushed the yiming/merge-node-no-upstream-actors branch from 8a9dab5 to fc55c3f Compare February 5, 2025 08:55
@wenym1 wenym1 added this pull request to the merge queue Feb 5, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 5, 2025
@wenym1 wenym1 added this pull request to the merge queue Feb 5, 2025
@wenym1 wenym1 removed this pull request from the merge queue due to a manual request Feb 5, 2025
@wenym1 wenym1 added this pull request to the merge queue Feb 5, 2025
Merged via the queue into main with commit 827ce14 Feb 5, 2025
33 of 36 checks passed
@wenym1 wenym1 deleted the yiming/merge-node-no-upstream-actors branch February 5, 2025 11:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants